system-coinmp

Gbp-Pq: Name system-coinmp.diff

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 8e8e0b708e5d135418ecae33a4cc8b68bfdf8479..176693ce08e8351013312f585474975f0d37e9be 100644 (file)
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2217,6 +2217,8 @@ endif # ENABLE_LPSOLVE
 
 ifneq ($(ENABLE_COINMP),)
 
+ifneq ($(SYSTEM_COINMP),TRUE)
+
 define gb_LinkTarget__use_coinmp
 $(call gb_LinkTarget_use_package,$(1),coinmp)
 ifeq ($(COM),MSC)
@@ -2245,6 +2247,19 @@ $(eval $(call gb_Helper_register_packages_for_install,ooo,\
        coinmp \
 ))
 
+else # SYSTEM_COINMP
+
+define gb_LinkTarget__use_coinmp
+$(call gb_LinkTarget_set_include,$(1),\
+       $$(INCLUDE) \
+       $(COINMP_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(COINMP_LIBS))
+
+endef
+
+endif
+
 else
 
 gb_LinkTarget__use_coinmp :=

diff --git a/config_host.mk.in b/config_host.mk.in
index e97ecba252b12bc48611659d9073fd6f483ed286..a1087beea1ae7c0766c970304cab67277d62cb70 100644 (file)
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -111,6 +111,9 @@ export ENABLE_CAIRO_CANVAS=@ENABLE_CAIRO_CANVAS@
 export ENABLE_CHART_TESTS=@ENABLE_CHART_TESTS@
 export ENABLE_CMIS=@ENABLE_CMIS@
 export ENABLE_COINMP=@ENABLE_COINMP@
+export SYSTEM_COINMP=@SYSTEM_COINMP@
+export COINMP_CFLAGS=@COINMP_CFLAGS@
+export COINMP_LIBS=@COINMP_LIBS@
 export ENABLE_COLLADA=@ENABLE_COLLADA@
 export ENABLE_CRASHDUMP=@ENABLE_CRASHDUMP@
 export ENABLE_CUPS=@ENABLE_CUPS@

diff --git a/configure.ac b/configure.ac
index b9fd794cc1d7cd6c8031ee265d5b85264aba2aa5..f6607fab8cc921ed557fd1d1d4d62039f9b25dcd 100644 (file)
Binary files a/configure.ac and b/configure.ac differ